diff --git a/web/atomic.go b/web/atomic.go
index 1bbf48e..aab483a 100644
--- a/web/atomic.go
+++ b/web/atomic.go
@@ -5,10 +5,10 @@ import (
 	"unsafe"
 )
 
-func (rt *router) getMachine() routeMachine {
+func (rt *router) getMachine() *routeMachine {
 	ptr := (*unsafe.Pointer)(unsafe.Pointer(&rt.machine))
 	sm := (*routeMachine)(atomic.LoadPointer(ptr))
-	return *sm
+	return sm
 }
 func (rt *router) setMachine(m *routeMachine) {
 	ptr := (*unsafe.Pointer)(unsafe.Pointer(&rt.machine))
diff --git a/web/router.go b/web/router.go
index 137301c..cc52d96 100644
--- a/web/router.go
+++ b/web/router.go
@@ -231,7 +231,7 @@ func (rm routeMachine) route(c *C, w http.ResponseWriter, r *http.Request) (meth
 // after all the routes have been added, and will be called automatically for
 // you (at some performance cost on the first request) if you do not call it
 // explicitly.
-func (rt *router) Compile() {
+func (rt *router) Compile() *routeMachine {
 	rt.lock.Lock()
 	defer rt.lock.Unlock()
 	sm := routeMachine{
@@ -239,14 +239,16 @@ func (rt *router) Compile() {
 		routes: rt.routes,
 	}
 	rt.setMachine(&sm)
+	return &sm
 }
 
 func (rt *router) route(c *C, w http.ResponseWriter, r *http.Request) {
-	if rt.machine == nil {
-		rt.Compile()
+	rm := rt.getMachine()
+	if rm == nil {
+		rm = rt.Compile()
 	}
 
-	methods, ok := rt.getMachine().route(c, w, r)
+	methods, ok := rm.route(c, w, r)
 	if ok {
 		return
 	}