explicitly state versions when there is a mismatch
timestamp fix