Resolves issue 8