fix closure builder arguments