fix(): move  out of closure