Current directory issue fixed