Changing currentCodition fields' to correct type