Closes #200 - electricity bill saved incorrectly