Properly handle under-/overrun walks, fixes #1