Fixed closure related build issue