Fixes class categories