Fix GetState() issue