Bugfix. Closes #12