Resolving issue #101