Fixed one evil exchange bug & another is on the way