fix bug issue #80