This fix resolves issue #1