Fix issue #136

Fix issue #136