Tweak the logic a bit