Fixed registration hopefully