Fixes #22, sort of