Fixed #1056
Merge pull request #1057 from Bo98/1056-fix

Fixed #1056