#260 cross transaction entities fixed