Code review tweak from @bsnape