Fixed grepping issues