Bug fix on initial PW