enhancement: fixes #80