Thread stop fix