another try at fixing #8789 #8799

Closed belforte closed 3 days ago