9.2.3 with putname fix