Infrastructure state fix