Fix feed implementation