Fixed events for old decorator