fixes #49, fixes #54