diff --git a/include/gp/function.hpp b/include/gp/function.hpp
index 1a38cc9..53d9610 100644
--- a/include/gp/function.hpp
+++ b/include/gp/function.hpp
@@ -15,10 +15,10 @@ namespace gp{
 		};
 
 		template<typename fn>
-		class callable : virtual_callable{
+		class callable : public virtual_callable{
 			fn internal_representation;
 		public:
-			callable(const fn func)
+			callable(const fn& func)
 			: internal_representation{func}
 			{}
 
@@ -100,7 +100,7 @@ namespace gp{
 			}
 			else
 			{
-				self = new callable<T>(t);
+				self.functor = new callable<T>(t);
 				state = (state_t)(ACTIVE | NO_SOO);
 			}
 		}