Fixing issue #334.