removed hasImage check