Fixes issue1828
Merge pull request #369 from spametki/issue1828

Fixes issue1828