Fixed in further PR.