trying to fix bugs in Media Manager