fix grid issue