Fixed display issue, #1567