Ugly fix for ugly glitch (say that very quickly)