Correction to previous commit

I did the merge improperly