S71601: Ensure reloading of states on type change