Update to fix shadowed events controller calls.