Backport fix for #251