backport hang fix