fixes #11
fixes #12