Added changes missed from previous commit