Fix issue #139