Fix abrupt termination bug
Insert static watches it not found