diff --git a/src/mol-plugin/behavior/dynamic/volume-streaming/behavior.ts b/src/mol-plugin/behavior/dynamic/volume-streaming/behavior.ts
index 951ec3946342d207d28d3f0dd001d69adcac0485..8a5da762cb8ce85f352247902ac3f62f2c0940d4 100644
--- a/src/mol-plugin/behavior/dynamic/volume-streaming/behavior.ts
+++ b/src/mol-plugin/behavior/dynamic/volume-streaming/behavior.ts
@@ -212,7 +212,7 @@ export namespace VolumeStreaming {
             });
 
             this.subscribeObservable(this.plugin.behaviors.interaction.click, ({ current, buttons, modifiers }) => {
-                if (!Binding.match(this.params.bindings.clickVolumeAroundOnly, buttons, modifiers)) return;
+                if (!Binding.match(this.params.bindings.clickVolumeAroundOnly || DefaultBindings.clickVolumeAroundOnly, buttons, modifiers)) return;
                 if (this.params.view.name !== 'selection-box') {
                     this.lastLoci = current;
                 } else {
diff --git a/src/mol-plugin/state/transforms/model.ts b/src/mol-plugin/state/transforms/model.ts
index 5bc63f833d33c86bf468ac312c43e1c4e72d8275..921f3d9398d5dea7eb7675fd26cbb9b12d30ed4b 100644
--- a/src/mol-plugin/state/transforms/model.ts
+++ b/src/mol-plugin/state/transforms/model.ts
@@ -425,7 +425,7 @@ const StructureSelectionFromScript = PluginStateTransform.BuiltIn({
         return new SO.Molecule.Structure(s, props);
     },
     update: ({ a, b, oldParams, newParams, cache }) => {
-        if (Script.areEqual(oldParams.script, newParams.script)) {
+        if (!Script.areEqual(oldParams.script, newParams.script)) {
             return StateTransformer.UpdateResult.Recreate;
         }
 
diff --git a/src/mol-plugin/util/structure-comlex-helper.ts b/src/mol-plugin/util/structure-comlex-helper.ts
new file mode 100644
index 0000000000000000000000000000000000000000..7166dc0aa392d539871d9f141cfe8fc9edb8e4ea
--- /dev/null
+++ b/src/mol-plugin/util/structure-comlex-helper.ts
@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) 2019 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author David Sehnal <david.sehnal@gmail.com>
+ */
+