Fixing issue #65 finally