Fix gex bug