Fixed #629
Merge pull request #631 from ostcar/Issue629

Fixed #629