Fix issue #129