Navigation issue #216 solved