Fixing PSR-2