Fix data request bug