fixes #17
fixes #12