diff --git a/src/EVEMon.Common/Models/QueuedSkill.cs b/src/EVEMon.Common/Models/QueuedSkill.cs
index e0ac054d1..2431026ed 100644
--- a/src/EVEMon.Common/Models/QueuedSkill.cs
+++ b/src/EVEMon.Common/Models/QueuedSkill.cs
@@ -120,8 +120,7 @@ public int CurrentSP
         {
             get
             {
-                int estimatedSP = (int)(EndSP - EndTime.Subtract(DateTime.UtcNow).TotalHours *
-                    SkillPointsPerHour);
+                var estimatedSP = (int)(StartSP + (DateTime.UtcNow.Subtract(StartTime).TotalHours * SkillPointsPerHour));
                 return IsTraining ? Math.Max(estimatedSP, StartSP) : StartSP;
             }
         }