Fix timestamp resync after recent changes