fix order conflict