Follow up previous commit