Should be fixed in next PR