I took the liberty and, for consistency's sake, changed it for the download method, too, as it follows the same logic as in here.