Fixes navigation problems