Buttler is now in a race to be fit for England's white-ball tour of Pakistan, which begins next month.