Better image detection (for Søren Peter)