Minor modification on PSR-2