Resolving issue #168