fix some response problems