Fix order entity