Bugfix. Fixes #7