Right, I didn't aware that we have this event. We can get rid of the ugly timeout thing finally.