Fixing issue #345.