fixes for breakpoint