fixes #4
fixes #3