Fixed in next PR