fix #5280 #5284

Closed belforte closed 6 months ago