Fixed broken states