Fix Order inheritance