Fix for #71 - infinite energy