Fixed double display issue