fix mishandling PSM