This fixes the issue Navigation Enhancement #101.