correcting recent logic