fix for issue #812
fix for issue #812 - removed comment
fix for issue 812 - cosmetic simplification
Merge pull request #856 from miloszm/812

fix for issue 812