Fix versioned set_current 4