Fixed issue #158