Better current handling in navigation