Breakpoint fix for grid