fix order bug