Fix issue #84(2)
Fix issue #84(2)