Fix issue in underscore integration