Fixed feedback issue for live feedback