CCMBridge fix