Look back for valid positions if most recent is not valid.
Add v0.6.1 changes.