additional changes fix