Fix closure problem