fixes due to replacing underscore by lodash