Fixed problems with use of new grid