Fixes #17