Added a dirty hack to not re-run exchange