diff --git a/pytket/extensions/cutensornet/general_state/tensor_network_state.py b/pytket/extensions/cutensornet/general_state/tensor_network_state.py
index ed9a5cb2..7e94ae7d 100644
--- a/pytket/extensions/cutensornet/general_state/tensor_network_state.py
+++ b/pytket/extensions/cutensornet/general_state/tensor_network_state.py
@@ -47,7 +47,8 @@ def __init__(
             loglevel: Internal logger output level.
         """
         self._logger = set_logger("GeneralState", loglevel)
-        self._circuit = circuit.replace_implicit_wire_swaps()
+        self._circuit = circuit
+        self._circuit.replace_implicit_wire_swaps()
         self._handle = libhandle.handle
         self._dev = libhandle.dev
 
diff --git a/tests/test_general_state_operator_expval.py b/tests/test_general_state_operator_expval.py
index 69d26ea3..ea88a56a 100644
--- a/tests/test_general_state_operator_expval.py
+++ b/tests/test_general_state_operator_expval.py
@@ -156,7 +156,7 @@ def to_bool_tuple(n_qubits: int, x: int) -> tuple:
 
     with CuTensorNetHandle() as libhandle:
         state = GeneralState(ket_circ, libhandle)
-        oper = GeneralOperator(op, 2, libhandle)
+        oper = GeneralOperator(op, n_qubits, libhandle)
         ev = GeneralExpectationValue(state, oper, libhandle)
         ovl, state_norm = ev.configure().prepare().compute()
         ev.destroy()