Actually fix CME - what the hell was I thinking.