Solve display issue