Fix exchange bug