Fix current path issue