Bug fix #995
Merge pull request #1091 from aRn0D/fix#995

Bug fix #995