Fixing phantom events - for real this time guys.