Possible fix to the issue #379.