fixed Grid; see issue #28