fixes #29
fixes #30