Force updating before switching