Fixing breakpoint issue