Fixed #712
Merge pull request #752 from dvvrd/fix712

Fixed #712