Fix new glitch from recent fix.