Improved a fix.

This fix change the current directory before grep, but the behavior is
the same.