bug fixed with exchange