Fix from the merge