Fix CME with dependencies