Fixed #723
Merge pull request #820 from dvvrd/fix723

Fixed #723