Fix Issue #59

Fixing issue #59 with an small modification of pull request #60.