fix 1 for ps-1
fix 2 for ps-1