Fixed Simon glitch