[FIX] Fix navigation issue