Fixed in master