quick fix to avoid underscore dependencies