Event queue fix