Fixed for 5.x.