Fixes #230 (hopefully)