Merge pull request #256 from diogofscmariano/5.2

[CDF-370] - Fixed bug introduced in b639889e3906513c4de69dde72896d605ade...