fixes #3
fixes #2