fix glitch with switching between new and classic