fixes #5
Fix merge from issue #5