HOTFIX: mediaviewer