Fixes #82
Thanks Ole for finding it and AM for insight! :)