Fixup on PS1