- Fixed issue #2:
  Undefined behaviour due to the use of an undefined variable,
  discovered thanks to valgrind