Fix eternally hanging feeds