Fix issue #134

Fix issue #134