PSR fix round 2