Fixed DDC-2235.

Replaces #656