Fix related to API and zone bug