Resolving issue #46