Resolves issue 44