fix feed.
Merge branch 'hotfix/fix-feed'