fix 芒果TV #389, #384

fix 芒果TV #389, #384
Merge pull request #390 from karlcheong/master

fix 芒果TV #389, #384