fix for underscore upgrade