Code fix to PSR-1