dept_pw ver1 fix