Fix Checker hang