fixed ps for different os
merge