Note: this change and the similar one below weren't necessary for the fix. Just seemed worth putting in there.