Estimates of water shortage revised