Fix entity exchange mechanism.