Here is my proposed fix for this problem: