workaround for #8456 #8466

Closed belforte closed 4 weeks ago