diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index d6b09eb0b9..9fcd9991bf 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final List<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}
 	
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index d6b09eb0b9..9fcd9991bf 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final List<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index d6b09eb0b9..9fcd9991bf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final List<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index d6b09eb0b9..9fcd9991bf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final List<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index f2e1bbd15b..9fcd9991bf 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final ArrayList<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index f2e1bbd15b..9fcd9991bf 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final ArrayList<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index f2e1bbd15b..9fcd9991bf 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final ArrayList<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index f2e1bbd15b..9fcd9991bf 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final ArrayList<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index f2e1bbd15b..9fcd9991bf 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final ArrayList<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index f2e1bbd15b..9fcd9991bf 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final ArrayList<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index f2e1bbd15b..9fcd9991bf 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final ArrayList<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}
 	
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index f2e1bbd15b..9fcd9991bf 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final ArrayList<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}
 	
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index f2e1bbd15b..9fcd9991bf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final ArrayList<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}
 	
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
index f2e1bbd15b..9fcd9991bf 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
@@ -57,42 +57,6 @@ public class SchemeBufferTable
 	
 	public SchemeBufferTable()
 	{
-		int count = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
-			final ResultSet rs = st.executeQuery();
-			
-			while (rs.next())
-			{
-				final int objectId = rs.getInt("object_id");
-				final String schemeName = rs.getString("scheme_name");
-				final String[] skills = rs.getString("skills").split(",");
-				final ArrayList<Integer> schemeList = new ArrayList<>();
-				for (String skill : skills)
-				{
-					// Don't feed the skills list if the list is empty.
-					if (skill.isEmpty())
-					{
-						break;
-					}
-					
-					schemeList.add(Integer.parseInt(skill));
-				}
-				
-				setScheme(objectId, schemeName, schemeList);
-				count++;
-			}
-			
-			rs.close();
-			st.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes : " + e);
-		}
-		
 		try
 		{
 			final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -124,6 +88,42 @@ public class SchemeBufferTable
 		{
 			LOGGER.warning("SchemeBufferTable: Failed to load buff info : " + e);
 		}
+		
+		int count = 0;
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
+			ResultSet rs = st.executeQuery())
+		{
+			while (rs.next())
+			{
+				final int objectId = rs.getInt("object_id");
+				final String schemeName = rs.getString("scheme_name");
+				final String[] skills = rs.getString("skills").split(",");
+				final List<Integer> schemeList = new ArrayList<>();
+				for (String skill : skills)
+				{
+					// Don't feed the skills list if the list is empty.
+					if (skill.isEmpty())
+					{
+						break;
+					}
+					
+					final Integer skillId = Integer.parseInt(skill);
+					if (_availableBuffs.containsKey(skillId))
+					{
+						schemeList.add(skillId);
+					}
+				}
+				
+				setScheme(objectId, schemeName, schemeList);
+				count++;
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("SchemeBufferTable: Failed to load buff schemes: " + e);
+		}
+		
 		LOGGER.info("SchemeBufferTable: Loaded " + count + " players schemes and " + _availableBuffs.size() + " available buffs.");
 	}