Fix timestamp usage