Fixs after replacing the event dispatcher