Fixed #688
Merge pull request #756 from dvvrd/fix688

Fixed #688