fixed exchange partition handling