added dateFormatter fix