Fixing issue with datasource credentials in transaction