diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/data/DataListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/data/DataListener.kt
index ee91b22..724d00a 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/data/DataListener.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/data/DataListener.kt
@@ -2,10 +2,12 @@ package com.willfp.ecoskills.data
 
 import com.willfp.ecoskills.EcoSkillsPlugin
 import com.willfp.ecoskills.convertPersistentToYml
+import com.willfp.ecoskills.effects.Effect
 import com.willfp.ecoskills.effects.Effects
 import com.willfp.ecoskills.getSkillLevel
 import com.willfp.ecoskills.setEffectLevel
 import com.willfp.ecoskills.skills.Skills
+import org.bukkit.Bukkit
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.player.PlayerJoinEvent
@@ -19,8 +21,12 @@ class DataListener(
         event.player.convertPersistentToYml()
 
         for (skill in Skills.values()) {
-            for (effect in Effects.values()) {
-                event.player.setEffectLevel(effect, skill.getCumulativeLevelUpReward(effect, event.player.getSkillLevel(skill)))
+            for (levelUpReward in skill.getLevelUpRewards()) {
+                val obj = levelUpReward.obj
+                if (obj !is Effect) {
+                    continue
+                }
+                event.player.setEffectLevel(obj, skill.getCumulativeLevelUpReward(obj, event.player.getSkillLevel(skill)))
             }
         }
     }
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt
index 164b20d..f027969 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt
@@ -93,7 +93,7 @@ abstract class Skill(
 
     fun getCumulativeLevelUpReward(skillObject: SkillObject, to: Int): Int {
         var levels = 0
-        for (i in 1..to) {
+        for (i in 0..to) {
             levels += getLevelUpReward(skillObject, i)
         }