Make "strict navigation" a bit more flexible