#166 add this handler to debug enter and return