Fixed issue #136