Download is now handled properly