Fix previous commit, I made a confusion when merging my changes with the trunk