FIX_ISSUE_168_TO_ADD_TO_VIEW_CHANGE