fix issue #140