Fixing remote file issue