Fixed #721 - Consistent time and date