xiki: final fix.