Fixed bug with Grid