fixed event picking