fixes #2
fixes #18