Fix gi command