Why this this logic change? This worries me.