Fix issue #128