minor modifications
see issue #173
fixed issue #163