Bugfix in breakpoints