Fix responses