Fixes 383
Merge pull request #384 from afred/fix-383

Fixes 383