Fixes #7