Fix for Twilio. Issue #12