fix bug issue #84