Fix redirect & download mode