Final fix for today's database stupidity.