fix wrong lambda, use a handler factory instead for more clarity

fix wrong lambda, use a handler factory instead for more clarity #35