Fix image and picture conflict