Fixed feedback bug