Fix Order entity