Fixed issue #164