Bugfix Closes #1