diff --git a/swig/libcclfunctionaloperator.i b/swig/libcclfunctionaloperator.i
index 84802952519d8e91a834b5d29c3d097c3027dded..500352b8c5ddf88df07911ec2acfa78cf9defb20 100644
--- a/swig/libcclfunctionaloperator.i
+++ b/swig/libcclfunctionaloperator.i
@@ -14,7 +14,7 @@
 %include "std_string.i"
 %include "boost_shared_ptr.i"
 
-%template(ValuePtr) boost::shared_ptr<Wccl::Value>;
+// %template(ValuePtr) boost::shared_ptr<Wccl::Value>;
 
 namespace Wccl {
   class FunctionalOperator : public ParsedExpression {
diff --git a/swig/libccloperator.i b/swig/libccloperator.i
index f6e5b52cfb44de63b61e07c7106ed549ad035e9b..6f32a56533de816ee857c9555ac9110002eec511 100644
--- a/swig/libccloperator.i
+++ b/swig/libccloperator.i
@@ -60,10 +60,10 @@ namespace Wccl {
   %template (StrSetOperator) Operator<StrSet>;
   %template (PositionOperator) Operator<Position>;
 
-  %template (BoolOperatorPtr) shared_ptr<Wccl::Operator<Bool> >;
-  %template (TSetOperatorPtr) shared_ptr<Wccl::Operator<TSet> >;
-  %template (StrSetOperatorPtr) shared_ptr<Wccl::Operator<StrSet> >;
-  %template (PositionOperatorPtr) shared_ptr<Wccl::Operator<Position> >;
+  %template (BoolOperatorPtr) boost::shared_ptr<Operator<Bool> >;
+  %template (TSetOperatorPtr) boost::shared_ptr<Operator<TSet> >;
+  %template (StrSetOperatorPtr) boost::shared_ptr<Operator<StrSet> >;
+  %template (PositionOperatorPtr) boost::shared_ptr<Operator<Position> >;
 }
 
 using namespace boost;