Another fix for aa2885f9e0e40f245bf621c0f61708e2162fc50d.