resolving issue #59