Fix problem of new version's grep