Fixed for 17-rc1