fixes #46
fixes #32