[3.9] Task manager fix