Workaround bug in odbc - added to both connection functions