fix PS1 issues