Fix class adapter FIXME