Resolving issue #40