'Resolves' issue #168