Fix for SQP w/ CD