TODO fix image fetching