bug fix: grid messedup