Fix more bad logic