I think this might already happen from your fixEvent additions.