Hopefully finally fixes the rss issues #520