Add second FIXME for Class Adapter