Fixed DDC-2506 by manually updating code. Closes PR #708.