Add var keyword to prevent global leak
Merge commit 'ce5fdde58e26612772b020acb40fb93a1b7caa5f'