Workaround for salesforce issue around class versions