Fixing a regression in gauge behavior

Fixing a regression in gauge behavior