PSR loader fix