Fix PS1 and RPS1