fixes #56
fixes #57