Fix closure binding problem