Fix issue from last commit where columns didn't reset correctly