Fix for PSR-2