Don't extract images twice on decode