Fixed in 35360cb