Fixed timestamp leak