*Final* patch for -C fix

Should be properly adding the remote directory now.