Bug hunt for CLS