Fix for events creation