$ADDRESS_STATE_FULL to sync up with #605