Fixed #555
Merge pull request #556 from dswd/fix

Fixed #555