Resolving issue #15