Fixing new feedback bug