Fix issue #137