Use my navigation fork until someone fixes Issue #137