Fix Cassandra