CASSANDRA-4421 fix issue at CASSANDRA-5573