State localization fix