fix bug caused by salesforce releasev31