In GETWIM support, generate the PSR more correctly.