--- BindingModel.java	2013-08-13 13:47:55.000000000 -0400
+++ BindingModel.java	2013-08-13 13:48:48.000000000 -0400
@@ -237,7 +237,10 @@
 			if (obj instanceof Binding) {
 				Binding b = (Binding) obj;
 				if (!activeManagerBindings.contains(b)) {
-					be.fill(b.getParameterizedCommand());
+					ParameterizedCommand cmd = b.getParameterizedCommand();
+					if (cmd != null) {
+						commandToElement.remove(cmd);
+					}	
 					bindingToElement.remove(b);
 					i.remove();
 					controller.firePropertyChange(this, PROP_BINDING_REMOVE,