Fix for DDC-2203
Merge pull request #548 from nemekzg/DDC-2203

Fix for DDC-2203