And fix the last attempt at the logic fix.