Fix return data un exchange class