closure & escape fix