diff --git a/container.go b/container.go
index 16065e60f1..9e336cbd0b 100644
--- a/container.go
+++ b/container.go
@@ -3,7 +3,7 @@ package libcluster
 import "github.com/samalba/dockerclient"
 
 type Container struct {
-	*dockerclient.Container
+	dockerclient.Container
 
 	node *Node
 }
diff --git a/node.go b/node.go
index 7cbd04ee20..66a8dc6ca1 100644
--- a/node.go
+++ b/node.go
@@ -118,8 +118,8 @@ func (n *Node) updateState() error {
 	n.containers = make(map[string]*Container)
 	for _, c := range containers {
 		container := &Container{}
-		container.Container = &c
-		n.containers[c.Id] = container
+		container.Container = c
+		n.containers[container.Id] = container
 	}
 
 	log.Printf("[%s] Updated state", n.ID)