second attempt to fix #8509 #8512

Closed belforte closed 1 week ago