Simpler & better fix for google issue 72