fix to exchange controller