Resolves issue 5