fix order and missing