Fix Feed bug