Fix for the "oldClass" not showing in the event, first time the event wasn't fired