[CDF-441] - Fixing previous solution