fix CakeEventManger issues #2897

fix CakeEventManger issues #2897