Commit Nick Gorham's suggestion for timestamp fix