issue #280 fixed