Fixed to stop crashing
Merge branch 'master' into ElectricalAge
Merge branch 'master' into ElectricalAge (reverted from commit d2dba4cd484318c1004d56fefcff72530adfa8f9)