Fix reproducability issue reported by YP autobuilder