Fix to MandrillClient