XA fails when select on databaselinks

My application uses tables/views from his own database and query some views defined with databaselink to another database.
If XA is not activated, all is OK, but when XA is up, the transaction crashes with the error ORA-24784.

example:

select (local) table1;

select (local table2

select (remote) table3 (with databaselink)

select (local) table4

insert into (local )table6

One solution is modify the code adding a commit/rollback before the call to the remote table. But we have a lot of code to review.

We are looking for another solution that not implies these changes