fix bug
Merge branch 'remove-ps'