Fixed the CLM Issues