re-add cls compliance

fixes