Fix versioned set_current 3