I think you will also have to change the order so the formula JohnTopley suggests is fired before the others.

BSB