Bugfix, Closes #1