This resolves the issue produced by the patch provided just before this commit on issue #2