Bug fix on grid full and grid two-third