Fix bkpt issue