Fix hang in Pangya, again.