CARE#22: Fixed display issue