Modification of transaction behavior aimed at addressing issue #15