#35788 fixed display