fixed some missed logic