PSR-2 (again)