added logic for stopping RBF madness