Fixes #368 for master
Merge pull request #372 from bcordis/#368-master

Fixes #368 for master