Finally fix PS1 for good