Fixed closure logic