Timestamp miscalculation... fix