Fix https://datastax-oss.atlassian.net/browse/CSHARP-54