Fixed working directory issue