[CDF-294] - fix previous solution