fix progressbar
Merge branch 'fix-progressbar' into develop