Fixed ExchangeController