Yes, I agree that this looks like the wrong solution.