issue-17 | Fix after CR