uncomment, fix image name creation