Fizes #945
Merge pull request #1046 from Areloch/Issue_945

Fixes #945