fixed jpeg conflict