Fix problem if data is not fetched correctly