Some changes, fixed the blocking path navigation