Change State fix