Fix incompatibility with latest version of underscore