Fixes #22