Fix final response