Fixing display issue