fixed for PSR-2