diff --git a/claripy/ast/base.py b/claripy/ast/base.py
index <HASH>..<HASH> 100644
--- a/claripy/ast/base.py
+++ b/claripy/ast/base.py
@@ -985,7 +985,7 @@ def simplify(e):
     else:
         # Copy some parameters (that should really go to the Annotation backend)
         s._uninitialized = e.uninitialized
-        if s.op == 'BVS':
+        if s.op == 'BVS' and e.op == 'BVS':
             modifiable = list(s.args)
             modifiable[4] = e.args[4]
             s.args = tuple(modifiable)
Fix simplification into BVS from not BVS breaking the fix