Fixed due to _.defaults logic changes