Timestamp: Fixed arithmetic issue