Added proper bounding for grid target