fix pollution of global namespace