Fix versioned set_current 1
Fix versioned set_current 2