Server feed bug fix