Fix for Salesforce Adapter