Minor logic tweak