Add safety for some possible glitch