@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.IO;
+using System.Linq;
 using System.Windows.Forms;
 using ReClassNET.Debugger;
 using ReClassNET.Extensions;
@@ -12,15 +13,21 @@ namespace ReClassNET.Core
 {
 	public class CoreFunctionsManager : IDisposable
 	{
-		public readonly Dictionary<string, ICoreProcessFunctions> functionsRegistry = new Dictionary<string, ICoreProcessFunctions>();
-
-		public IEnumerable<string> FunctionProviders => functionsRegistry.Keys;
-		public ICoreProcessFunctions CurrentFunctions => currentFunctions;
+		private readonly Dictionary<string, ICoreProcessFunctions> functionsRegistry = new Dictionary<string, ICoreProcessFunctions>();
 
 		private readonly InternalCoreFunctions internalCoreFunctions;
 
 		private ICoreProcessFunctions currentFunctions;
 
+		public IEnumerable<string> FunctionProviders => functionsRegistry.Keys;
+
+		public ICoreProcessFunctions CurrentFunctions => currentFunctions;
+
+		public string CurrentFunctionsProvider => functionsRegistry
+			.Where(kv => kv.Value == currentFunctions)
+			.Select(kv => kv.Key)
+			.FirstOrDefault();
+
 		public CoreFunctionsManager()
 		{
 			internalCoreFunctions = InternalCoreFunctions.Create();
 
@@ -43,13 +43,11 @@ internal PluginForm(PluginManager pluginManager)
 
 			UpdatePluginDescription();
 
-            // Native Methods Tab
+			// Native Methods Tab
 
-			string[] arrayOfFunctions = Program.CoreFunctions.FunctionProviders.ToArray();
-			var funcIndexStr = Program.CoreFunctions.functionsRegistry.FirstOrDefault(p => p.Value == Program.CoreFunctions.CurrentFunctions);
-
-			functionsProvidersComboBox.Items.AddRange(arrayOfFunctions);
-			functionsProvidersComboBox.SelectedIndex = funcIndexStr.Value == null ? 0 : Array.IndexOf(arrayOfFunctions, funcIndexStr.Key);
+			var providers = Program.CoreFunctions.FunctionProviders.ToArray();
+			functionsProvidersComboBox.Items.AddRange(providers);
+			functionsProvidersComboBox.SelectedIndex = Array.IndexOf(providers, Program.CoreFunctions.CurrentFunctionsProvider);
 		}
 
 		protected override void OnLoad(EventArgs e)
@@ -69,7 +67,7 @@ protected override void OnFormClosed(FormClosedEventArgs e)
 		#region Event Handler
 
 		private void pluginsDataGridView_SelectionChanged(object sender, EventArgs e)
-        {
+		{
 			UpdatePluginDescription();
 		}