Do you think it's worth including @cupakromer's fix in #1478 here?