fix small global namespace pollution