Fixed issue #140