Re #1672 Modifying timestamp extraction.