Start of fix for gargantuan bug