Fix/download manager 2.0