issues#next - fix timestamps