enhancement: fixes #84