Upgrade for #341 fix

Fixes #341