Feature/feed fix