Fixes #28