additional changes missed on the previous commit