Fix to media class