issue #70 added