Address State fix