Actual fix for position issue.

Previous fix still has range position issues: 871309df5fae7a48613e027343220a4c1fbe3212

As @xeno-by noticed, the test was awfully machine-specific! Oops, :p