Fixed in afdd837