psr fixes 2