Fix issue #126