Fix order comments