Fixed issue #174