Fix custom_classes