Fixed #692
Merge pull request #846 from tacef/master

Fixed #692