Fixes #22 (it should, at least)