Fix Issue #281: Infinite Loop Navigation