Fix image / no image logic