Fixing something I by mistake took out in the merge