Fixed a problem with underscore dependence