fixed issue with data fetched from the same field