Added patch lost in the merge