Weird state fix