fix navigation issue return tracking