Another timestamp fix