Improve handling of nonsourced images