Fix square display issue