PSI some changes in order to solve issue6