This commit attemps to fix image format issues