Fixing RBP notifications