Trying to fix output bug tracked in issue #2.