Fixed #604
Merge pull request #630 from ostcar/Issue604

Fixed #604