Fixed lodash
WIP