Use Andrew's preferred fix for oneEventMode.