Fixes #2352 PSR Class Load (#2353)