Fixing CR formation bug