[CDE-150] Fix previous solution