So with this change we actually never update self.timestamp if only a date has been specified. Is that really wanted?