Fixed issue #167