Resolving issue #174