Checked the fix in TODO list