resolving issue #39