Completed fix to event