fix broken rbf usages