Fixing media plugin including issue 4734