Moving this fix to the goweb codebase