diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
index d08994f1..af416dbb 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
@@ -175,7 +175,7 @@ class Calculator {
             var average = 0.0
             if (sessions.size > 0) {
                 average = sum / sessions.size.toDouble()
-                val winRatio = (winningSessionCount / sessions.size).toDouble()
+                val winRatio = winningSessionCount.toDouble() / sessions.size.toDouble()
                 val avgBuyin = totalBuyin / sessions.size
 
                 results.addStats(setOf(
@@ -188,6 +188,7 @@ class Calculator {
 	        if (sessionSets.size > 0) {
 		        val avgDuration = duration / sessionSets.size
 		        results.addStats(setOf(
+                    ComputedStat(HOURLY_RATE, hourlyRate),
 			        ComputedStat(AVERAGE_DURATION, avgDuration)
 		        ))
 	        }
@@ -195,7 +196,6 @@ class Calculator {
 		        // Create stats
             results.addStats(setOf(
                 ComputedStat(NETRESULT, sum),
-                ComputedStat(HOURLY_RATE, hourlyRate),
                 ComputedStat(DURATION, duration),
                 ComputedStat(NUMBER_OF_SETS, sessionSets.size.toDouble()),
                 ComputedStat(NUMBER_OF_GAMES, sessions.size.toDouble()),