Small improvement in grab script