Fixed psr-0 problem