cleaned up some navigational issues
this version causes a segfault on 2.1.1 and 2.1.2
workaround for the segfaulting
workaround for the segfaulting