fixed psr-4 issue again, after previous commit mysteriously reverted