Fixing PSD1 for PS V2.0 support