One more fix for PSR2