Fix for issue #3 in case we use cURL