Fixed form_state changes