Bugfix Closes #35 MR