Fix Event Creation