bug fix(closure)