Improved diepage

Fixed #13574
Fixed #13578