updated machado - removed breakpoint checker