date fix part II