modfiy bug issue-18