Fix issue #140