He may be back at world number one, but Nadal is far from fully recovered from the hip problem which forced him to sit out the Indian Wells and Miami Masters.