Fixed #580
Merge pull request #628 from ostcar/Issue580

Fixed #580