Fix closure issue