New attempt at fixing download gauge overflow (#2123)