Fix to download into separate window