Fix issue #174