Fix BlockGrid bug