bug fixes 525 on grid