fixed event nav func
resolved conflict