Resolved bug related to pwd