fixes in psr
Fixed PSR2