Fixed find and modify