Fixed GaugeShift problem