temp fix for custom-feed until it is rebased