Resolve PWD problem