more sensible navigation behaviour