Fixed #475
Merge pull request #758 from dvvrd/fix475

Fixed #475