Fixed issue with images not being properly fetched