Patch fin and tap to avoid loosing context.