Here is the fix that works for me.