zero-state fix