added more 'safety' to '_'