bug fixes for CX1.