Fixed bug where Event would not handle new #wait while #set was processing