Fixing issue #66