enhancement: fixes #83