Fixed for PSR-2 compilance