Migrated to underscore 1.7