Closure fix