fix DDC-2579
Merge pull request #739 from FabioBatSilva/DDC-2579

Fix DDC-2579