* Fixed issue CES-1670.  Ready to test.

To test, do blah and blah and blah.