Fixes #35 (hopefully)