Fixes #3
another fixes #3
merge