fixed some bug in feeds
using ours