[CDF-441] - Fixing previous solution
Merge pull request #336 from jvelasques/CDF-441

[CDF-441] - Fixing previous solution