fixes #56 and fixes #57