fix org fetching exception