fixed some breakpoints