Fixed PWD resolution when called through wrapper