bugfix, Closes #2