Fixed closure bug