So, what do you think is the fix / "correct" / "right" ?