Fixes #11 (hacky, hopefully temporary)
Speculative fix for #22
Beta 9-4