Fix according to PSR-1