Bugfix which closes #139