Fixed working directory problem