diff --git a/engine/gamemap/level.go b/engine/gamemap/level.go
index eebff22..373c09b 100644
--- a/engine/gamemap/level.go
+++ b/engine/gamemap/level.go
@@ -49,6 +49,7 @@ func (l *Level) Put (x, y int, tileFunc interface{}) {
 
 func NewLevel(ctx util.ClientCtx, branch string, depth int) *Level {
 	l := &Level{
+		ctx: ctx,
 		Name:     branch + string(depth),
 		Depth:    depth,
 		Rect: types.NewRect(0,0, mapWidth, mapHeight),
diff --git a/engine/gamestate/gamestate.go b/engine/gamestate/gamestate.go
index d20b9ae..6fe2dc4 100644
--- a/engine/gamestate/gamestate.go
+++ b/engine/gamestate/gamestate.go
@@ -21,6 +21,7 @@ func (g *GameState) Do(f func()) {
 	done := make(chan struct{}, 1)
 	g.Mainfunc <- func() {
 		f()
+		f = nil //zero pointer for closure function
 		done <- struct{}{}
 	}
 	<-done