Upgrade for #341 fix