fix grid fitting for corner cases