Fix to last change