fixes #2, fixes #28