Fix issue: remove HYDRATE_ARRAY