improved exchange partition detection