add watch dog
fixes
more fix