Resolving issue 140