fixed issue 1459
Merge pull request #81 from niphlod/issue/1459

fixed issue 1459