BUGFIX on registration following a merge...