Merge pull request #970 from Lomanic/issue958