Fixed #203
Merge pull request #206 from justjanne/pr/fix-203

Fixed #203