Quick fix for event order problem