fix order problem