Fixes #6