Fixed #208
Merge pull request #211 from adonath/fix_for_#208

Fixed #208