fixes #2
fixes #1