* Fixed issue CES-1670.  Ready to test.

To test, do this and then this and then this.