fixes #3
fixes #5