Unfix broken fix for #85