Resolves issue #2