Searching for the PSR-0 fix...