Fixed issue #181