Fix hang introduced in 581bbff