Fix issue #130