Bug fix on small grid
Updated grid samples