psr1//psr2 fix