V15.3.1 fixed lookahead to also restore old position