Possible mitigation for #77, root issue unaddressed