Error mitigation for issue 120