Fixed bug where Current GM showed up incorrectly