Fix for miss-chance on baton, take 2