fixes #55
fixes #55, #51