Fixes #46 (maybe?)
Fix #46