Fix bugs from last commit: exchange.