Fix remote event handler