Added back _.isEmpty check for now