Added changes missing from previous commit