Fixed the new image distribution bugs