Fix how "psname" is handled