Trivial: ensure consistent use of base version, otherwise can end up with key and location mismatch