Added changes missing in previous commit