Switch to cl compiler.
BUG Fix.