Fix for invalid event identifier