Fixing issue #65