Fixed psr-0