Fixing generic registration

Should be all green now!