Second attempt at fixing feed links