fix criticial pw issue