fixes #2
fixes #3