Fix closure evaluation