Fixed fetching until end when only images issue