Fixed the fix that didn't quite fix the unfixed situation.
              Fixes Issue #8 - again