fixes #35
Applied bugfix 35