i think this properly fixes #87