Arrow nav issue fix