Resolving issue #4