Register with class fix