Fix issue #135