Fixing issue #329.