fixes #55, fixes #54