Closure compilation fix