Fix SwapInfobar to work with plugin