Hotfix to feed service