Fix bad registration implementation