bug fix with PS1