Resolving issue #13