enhancement: fixes #82