fixes #2
fixes #471