Fix issue #134