Previous commit broke non-Unicode titled downloads

Oops! After some further testing, this works better