Global state fix