Fixing event bus send interrop issues