Fixed grep routine..