RF: fix order