Yes, I think that'll fix it, and it's simpler.