Fixing issue #310.