diff --git a/Helios/Source/BatteryChargeModule.cs b/Helios/Source/BatteryChargeModule.cs
index 198882ab78b233fbc463d958de041a0522eaedd6..5c895942ed4e9ba36aacea2c30933b7f061a8f8e 100644
--- a/Helios/Source/BatteryChargeModule.cs
+++ b/Helios/Source/BatteryChargeModule.cs
@@ -19,7 +19,7 @@ namespace Helios.Source
         {
             double totalOutput;
 
-            totalOutput = solarPanelEfficiency * solarEnergy * roofArea * this.Efficiency * Math.Sin(sunAngle);
+            totalOutput = solarPanelEfficiency * solarEnergy * roofArea * this.Efficiency * Math.Sin(Math.PI * sunAngle / 180.0);
 
             this.TotalOutput = totalOutput;
 
diff --git a/Helios/Source/SolarPanel.cs b/Helios/Source/SolarPanel.cs
index 0e8e59df3c1fbb1f46be1d5e96b9bf8464e3edfb..4dcb9ad0c10aff54fecc7a9cfc6bc105c98a2623 100644
--- a/Helios/Source/SolarPanel.cs
+++ b/Helios/Source/SolarPanel.cs
@@ -36,7 +36,7 @@ namespace Helios.Source
         {
             double powerOutput;
 
-            powerOutput = Efficiency * solarEnergy * roofArea * Math.Sin(roofElevation);
+            powerOutput = Efficiency * solarEnergy * roofArea * Math.Sin(Math.PI * roofElevation / 180.0);
 
             this.PowerOutput = powerOutput;