Temp fix for events